Fixed #2343.
Backend SHA: c82ae435848138bebab33b74b6b45ab9dcaee4a5