Apply issue 48