REF: fixed bug on debug mode again