a bit more correct