Fix #21 - inconsistent return point