Fixed the previous issues