Fix for MoKeeHelper