Fxies for #1109
Fixes for #1109