More bug s fixed