Fixed last merge (see #459)