improve contractacio form behaviour 32