Version 3.5: only bug fix