Bug fix to v.0.2.1.18