Added safety check in case the bug happens again