Fixed efficient solver