Fixed issue with areas and files