fix attempt for issue #21