Secondary fix for swapping