Possible buggfix