Fixed errors with location added