issue with rescue was fixed