fix drawing issues