Fixed Marius' errors