Fix for #55

fix for #55