Fixing of the bugs