Fix for #3155