fixing after yorick code merge