Bugfix Risk-1: Fortify and roll