Reverted fix