* a little more correctness