proposed fix to #1