Fix to stop gdb printing too much info