fixed PIM-1278
Fixed imports