Fix bug 6040

sdfasdf