Fixed bugs in option passing, sigh
0.4.198