fixed double checking