Fixes options overriding