fixing issues with previous commit