Fixed #2446