Somewhat fix #33