Fixed problem from Costa