Merge #36: Correcting code