Expo units fix