Fixed Bug @ Frontend caused by Merging