Fixed Punitive CS
Fixed #373 (Director Haas)