fixes for random version