Fixed a bug on all the other pages