Fix double check