[WIP] Fixes #16