Sub Community Bug Fix