fix permissions
merged