to allow stuff in pull #17 to work