Fixed the fix for #9