Bugfix and added random plugin