Fixed null options bug