minor fixtures optimization