Comply to #1556