[#499] Fix bad merge.