implementation for issue # 143