Fixing issue #291 (WIP)

Get rid of this.