Another bug fixx.. stupid meetings breaking my concentration