Follows the suggestion from #34