Fix draw optimisation