Fixing #1148.

Close #1148