Add a missing break
Fixed suspension by reworking common property logic