[#master] Added fix for issue #1.