Fixing issue #291 (WIP)

You don't want to do this.