Fix #23. Fix #24.