Bug fix on speedy