Fixed functions
Fixed functions