Fixes #1955 putting back sub as default behaviour for now