Fixed: issuse #6