Improvements for #161 (#169)