Option handling fix