fixed use of deprecated Opiontal<>::empty