fixed ussue #2