For #28 small changes