Ok. Cool. Tested #27 and it fixes timeout or no record issues resulting from ...