change back to working version with older plugins