fixed with Erics feedback