Harmonize Zhiqiang Ma's solution with the one of the previous question