Marc: Slight bug fixed