Fixed issues relating to the previous commit