Better place to fix bug