some bugs against 21.4.12