Update source for issue 495