fix bug on classic view