MoSKito Features fix