Fixed issue #29

Not PERFECT, but no one other than me will notice.