APOLLO-3600 Fix for unnasigned cases dissapearing