Rearranged previous change to actually allow the issue to be fixed.