Fix #69 as agreed.