fixed on bug, exposed another