Fixed bug signaled by ale.settimi@gmail.com