Another attempt to fix bugs