Problem hacked solution for spec performance