Bug fix
Get slightly better results