Fix hotbar swap bug