fix attempt for issue #26