fixes #4, #5