merge the same fix from master