Reverted code
Fixed code