Fixed constructor state changes