Fix #104 (improved after discussion w/ @deniak).