Return and then increment value

@mochnatiy please check you proposal.
:ok_hand: