fix for issue # 222