Updated build path logic

Fixes rQBEXca19e3dc5d45d72dba9fc823a94852aadbe2ed0e