Fixed plugin functionality