add based on nugroho suggestion