[FIX] Pull-request comments