changed something to avoid future errors