fixed helpers to make them less broken