add hack to prevent skipping, make comments clear