Fixed bug that came from the change of views