final change for #1155
Merge pull request #1181 from belforte/master

final change for #1155