Fixed a bug .. disabled one future feature.