Fixes for #2102

fixes #2102