removed breaking return fixes #936