made things a bit more correct