solving bugs still