fixed draw logic