Yes, this actually Fixes #13