implementation corrected #218