GLPT 0036

Fixed performance in general.