Fix for Random to work the way the app want it