Another attempt to fix bug