Code

patch from 417179 by Alvin