Fix for label/options overloading bug