dispose on empty baron fix