Version 3.12, bug fix