Fixed borked logic