fixes #5 and #6