attempting to fix issue #18