Fix for #568 isssue