Fixed Logicat solver, finally