temporary fix (do not use the incomplete flag yet)