bugfix for 4f4526a3b617b1d169e985acbc9d7a342803fe3b