fix as in #1892 by @Marselka