Bug fix
Update states position