Another fix as suggested by @hai-cea