fix type, remove helper