Try to fix bug a bit more