State removed, direction-fix