Merge fix from karoshi-client