Fixing problems with previous commit