Fixing * stuff