Constitutional fix nears on headscarf ban