Bug40 fix