Fix passing options