Corrections for issue 1