better fix for $650