Easier debugging again