- fixed unnecessary double checking