Added a double check