Make a bit more flexible.