HAL-274: Fix double run-as error