Fixing reverted changes