added reverse compatibility