Feature #6229... again