Try to fix bug