Reactivated DEBUG flag from last commit