Attempting to fix issue #3228 properly