fixed gbp bugs