recommended bug fix for issue #43