Final fix for skip button