rene tassy: errors refactored