Fixed Nabi Issues N_SE-54264