Possible fix for null plugin :S