fixed compatibility with current rgkit