Fixed issue with incorrect status changing