Commit to repair issue 57