in fact the `$timeout` shouldn’t be necessary anymore, I’ll check that.