Fix for expired method bug