maybe fix for #1553