Bug Fix (0.5r08c)