third bugfix