Fixed Bug 1070070
Merge pull request #206 from errietta/bug1070070

Fixed Bug 1070070