Kirk selector fix (fixes #306)