Fix after merge #5. (reverse-merged from commit a4d9406e30e0df7233cfa57aba9648b71927c8cc)