3rd attempt to fix issue #7