Fixed the type detection #19