fix #6, i should squash those..