this fixes #7, #36