fixing beugs