fix for issue # 217