fixed to work in its final location