Preview build

Preview build + bug fix.