Fixed plugins 3 and 4