Fixed wrapping issues--by cheating--temp fix