Some minor bugg fix