bug fix for issue #36