Fix for bug #4324

This also effects 3.3/develop