Bugfixing Eduardo