Fix buggy commit 8386438d259da60358b2791ced379c9ba41751f3