Fixed a bug that caused over-initialization