Fixes latest records issue