Addressed issue#180

Addressed issue#180