Fixing rabbit pocalypse