Fixed build issue
Changes as per community feedback