bug fixes #23