This should fix issue #36