Issue # 459 fix. Test should be made
Issues #459 and #500 fixed