Fix issue 2703

This should fix issue #2703