This does the trick to fix the new issue that came up with #992.