fixes: 2229, 2320, 2331