Fix #15 - But don't like that it's not DRY