Added fix for consistent :disabled cross-driver outcome - fixes #3