this addresses partially #23