Fix colliding sid issue #36