fix for #1
merge