Speed bugfix