FIXED: debug code was deleted