Fix for -moz and -o