Another attempt to fix