Implementing suggestion from HN