manual merge for issue 24