Fix to @268b9ef4de6972371cee96bfb3a9b6f2af7ea485