workaround (fix?) for #510