Truly fixes #19.