Attempts to fix issue #20