Critical bug fixes #23.