Fix for issue #131 (from official repo). Tested and working. Although #130 could be better fix, but i haven't tested it.