Routine: fixes #177, #178