Finished QU fix