A whole bunch of stuff added to figure out where that bug comes from