Fixed stupid issue when parsing ImageName. Should still be done more rigorously. However, need a vesion tomorrow for a workshop