major bug fix in S05