Fix bug with roll calculation