solved issue #1372 for me