Skip to content

Handle more cases

Handle more cases #689