Fix #99 again