Fixed bug introduced merging last version.