Fix/improve safety of run formula