Improve 6.27