Fix issue #1103 and improve a bit