Fix [issue#3]