Add in safe-guard for the future