Fix initial drawing issue