Last attempt to fix this thing