Made it more DCE friendly