Fixed Bug#1