Solves bugs on creation
Solve some bugs