Fixed double post-init execution