Fixing issues with previous commit