Finally fixed the cutouts, fixes #23