Patch for http://iroffer.dinoex.de/issues/163#note-1