fixing declarations