Revert "removing TODO, its not a bug."

This reverts commit 12c44efccb3e99239520ca68149f5ee007603d28.
Merge branch 'master' of https://github.com/ofabricio/Citrus-Engine