[FIX] fixed #518