just return. this is a better solution. #18