Decorated workaround for #28