Apply issue 53