Problems described in #58, #812 and #828.

Todo: investigate problems and potential solutions

Expected behavior

Tell us what should happen

Actual behavior

Tell us what happens instead