bug #651 - change imports