fixing the structure