better fix for commit e18c3d9feff