Fix #94 again