Fixed mode bugs