Reverted fatal changes