Bug fixed -> another one appears! Fixed that one