Quick Fix for Annoying Behavior