Take @yjacolin comments into account