Retrocompatibility

I made a mistake on the last commit where I broke backward compatibility. This commit solves it.