This is a fix for the issue #1.