will be fixed with #149