bugfix wrong scope when callOrQueue doesn't queue