Trying to support #251. This si the first pass