TODO TEST fix guy roll after roll