this addresses partially #251