Ensure forward comp, fixes #36