Better fix for clearing on entry