Fix for new option prefix in RC3