Fixing drup filename and checking