Fixed to work better.