fixed with Erics suggestions