Fixed comp. bug