Fix bug for former modification