Exceeded records issue fix