Workaroung on #4 and new suggestion support #5