Tried bug fixing