attempt to fix stupid topic change blowing up