will be fixed with #139