Fix for #33 ?