Improve the check on startup