Fixed by 40177e4