[BUG #6865] Replaced deprecated class