fix proposal for bug 551