Fixed issues with previous commit