Simple fix to issue #36