[WIP] Fix issue 4