Hack fix: remove the after initialize stuff