Added an additional fix to 2.0.5