Updated after JANUS bugfixes