Fixed drawing issue