Make sure we have a fail-safe way...