Holy grail?

(Hopefully) fixes #5