Fix D4P support
Fix specialization bug #13