Added fix that should resolve issue #12