[Finishes #1437342]