Issue # 129 fixed