Fixed Chrome & FF Bug