Added change which got lost in merge process.