Fix #42 - ampersand termination bug