Test and Fix #105
Merging missing fix for #105