Fixed a bug for versions earlier than 1.3.2