Fix #69
Upper bound for #70