feature #568