Fixed compatibility with latte/latte