Fix for Issue 3339

Fix #3339