Fix for undefined options bug