added fix for #1