Fixed unreachable bugs

Had to swap a stuff and rest grrrrrrrrrr