Fix for plugin bug # 75