Back to previous version because a problem while checking file size was introduced