Partial fix for permissions issue