Some fixing