FIX: issuse #2