Fixed move drawing bug