Oops, we fixed this for __file some time ago - can you adopt the same way for __directory so it is consistent?