Build issue fixed