Fixed reverted errors