Fixed USE-flag issue