fix for issue221