Fixed issus in previous commits