Fixing le bug