This patch from Ralf Grosse Boerger makes debugging more comfortable.