Fixed clallback plugin