temporary guard removed, unit tests fixed