Covered over a hack and fixed a minor bug