Another attempt to fix it