20140414-2146: Fixed category bug...
20140414-2147: Fixed category bug...