Fixed #495 brokenness