* Fixed Initial bug