Some fixing done