authorization bug fixed
merged