Bug fix related to null options