Fix #103 again...