this ought to help with #26