I give up... Fixes #16