#138 fix wrong return