fix only_first implementation to return only increment