Compat with Quby 2