added fix for penalties and suspensions