Reverting changes introduced in version 1.3.2