FIX: Fixed problems for Gauss 12