new ver 21/8
fix