This fixes #1 and #2