Initializer modification according to #28