Fixed another bug ..