minor fix? should I change this back to what it was... more testing is needed