Fix reverted changes