Fixed logic for fab