Started bug fixing