Partial fix for issue #80