Fixes #7 reorder of the last commit