Fixed issues when has not moved