Fix bug to calassa