This fixes #2 and #3