BBC IA: Collate variables in time function and make the fix more similar to the original code