solved Issue #525