Nope, this should fix #17