Fixed Bug #7328

Special Thanks to Joseph / j-tkay !
http://hercules.ws/board/tracker/issue-7328-close-and-end/

Signed-off-by: shennetsind <ind@henn.et>