fixed nolunch logic