fix for #1070 previous fix not strong enough