[Fix] Fixed inadvertent "hovering" of CUs. Closes #58