Fixed logic for guides