Fix for issue #36