First fix ( not good but its a start anyway )