Fixed bugs in option passing, sigh