Volodya's bug and deletion of some import.