Issue 269

WIP to fix #269