Bug #8416 & #9665 fixed<br />Minor bug fix