Fixing over states for FEND-1152
Updates for FEND-1152