Working swap index look up adjustment