Fixed a major bug !