Fixed a bug introduced in release 3.4