Correction for ticket #6 and #25