Missing critical bug fix in 1.5.4