[!] Fixed bug in Resolved Issue #723