Fixes fix for #82