Merging fix with my branch (stefano)