Fixed crash due to using old files