Fix things closes #1