Selesai fix #4