May05 fix