Fix #2355 previous fix was incorrect - thanks Thomas Hipp