Fixing this once and for all. fixes #1