Fix bug for classic view