Fixed some mistakes for #552
Merge pull request #562 from JorWang/patch-4

Fixed some mistakes for #552