Fixes alex's comments