#738 Fixed issues