Hack to handle Penalty (work in progress)