Follow up 28a9fec0916db3d92629ae6e6cd62b5777b09e73
- Fixed Bug #7469
- Fixed Bug #7468

Signed-off-by: j-tkay <joseph.tk.ea@gmail.com>