@davideschiera fixed #237