Fix for swapped issue numbers