Fix for scope shifting; problem with tick