better fix for b99ab0a