Fixed issues with the previous commit