fixed issues made while merging...