overlooked a few things in last commit