Fixed # 6