Retry #116 hopefully its cleaner