Added fix for retrocompatibility after merge with pull request #53