Real fix for #9
Fix for #9