ME: made improvement suggested by Roy