added a workaround for for #338