[!] Removed condition check