Fix for broken build 721 due to safe parameter