add fix suggested by nalimilan