fixed issue 619