FIX : #1477, #1478, #1479