Minor refactoring
Prevent micro movement