I think I might have solved #14...