Change how options are set in fork

Fix for #485