Workaround for fixing the API bug, Closed #1.