Apply issue 40