Fixed unnecessary draw