[WIP] Trying to fix #7