Selector fixes for Graham (Fixes #517)