Updated fix issue with passing options