some fix on drawing