Second attempt at fix for #510 preview button