added a double check