Fixed #2416.

Backend SHA:f17a59701b58907b9dcd276f9e430f8f383ce909