fix to issue #36