Autocomp fix (Yes, another)