maybe fix for #1553, needs testing