The changes made here fixes #1.