Previous commit fixes #1 and #2.