Try to fix bug again