Removed BeforeDraw because of bug