Preliminary fix for issue #187