Fix for JS Bug after merging sources