strange regression, back to previous version