Fix bug #1090516
Merge pull request #219 from errietta/bug1090516

Fix bug #1090516