Issue #104 (strong typed)