Seemingly fixes #20