FIX: removed trace statement