Starting to bug fix