[FIX] fixed #513