Fixed JavaScript Issue