Fix for Endure Isses