Fixing random shizzle