Fix Class B restriction