Next tick fix

Highly technical fix to #487