Switching around now works