Fixed known bug