Critical bugfix #165. - v2.0.2