patches from Urban