hacky/magical - make explicit?