fixed permissions
merged