Another fix, This is just stupid now repeating same thing all over...