Updated Plugin 80 to fix issue #25