fixing marcos' pull request