this fixes #4 and fixes #5