fix logic take2