maybe fix for #1529, needs testing