Fixed first initialization