fixed. working