Fixed issue with multiple file builds