Re-fixing #99