fixed #387 : removed old implementation