Fix for misbehaving addon