Better way of doing this without making plugins angry