changed closes#1