adjusted for upcoming #108 change