Try to make s* a bit smarter