Fixed Joseph's 10.1 bug