Previous bug solved