fixed bug introduced in 1.22, map should be updated correctly now
Add version check before changing new state and using callback