Fixing #2401.

Backend SHA:1b8f16f2e59c35c9363ab6efebd65027eae9ed06