Follow #1404 in ja/sr