Fix #31 all over again