Fixed issue with nil default options