Added fix by cristopherzwt