Another attempt to fix this