Update #394 after review