Fixed issuse #63