#14438 Fixed couple of bugs