removed fix to cyclic solver as it appears not to work