should have beem fixed with last commit