9+ expand should now work