Found a better way to solve #86