Fix for extracting multiple build files with same name