Try reverting logic - check tbpl