Trying to fix issue #58