Bug in implementation of #35, failed to skip ourselves