hotfixing collection bug