no more blind faith. fixed #5