Working out the kinks
Possible fix for #1182