Fixing issue #291 (WIP)

You can remove this line.