Fixing the issue with speed