* CPU-side fix for the last commit