fixing master to support latest build