Fix attempt for issue #81