Finish fix for issue #25