Fixing #222 #204 for rotation problems