added changes for Issue1009