Issue # 402 fixed