Fix #413 - Make selector more specific