Fixed issue #87. Everything is working fine with v1.2.0