Bug fixes ver-2.0.1