Fix - workaround for unkown members