#161; needs testing