Fixed macrocell bug