Bugs fix

Release 3.1.4