Another fix for issue #24