Bug fix for conflict with core colour picker