OK, do that properly