Update for issue#35