Fixed regression with import of 'caption' and 'subfig' packages.