[WIP] Fix for #65